Revision: tla--integration--1.1--patch-60
Archive: rbtcollins@hotmail.com--barch
Creator: Robert Collins <rbtcollins@hotmail.com>
Date: Thu Jan 15 16:04:50 EST 2004
Standard-date: 2004-01-15 05:04:50 GMT
Modified-files: libarch/arbdelta.c libarch/cmd-changes.c
    libarch/cmd-changeset.c libarch/cmd-delta.c
    libarch/commit.c libarch/diffs.c libarch/diffs.h
    libarch/make-changeset.c libarch/make-changeset.h
    libarch/star-merge.c libarch/undo.c
New-patches: aaron.bentley@utoronto.ca--tla-2004/tlasrc--local--1.2--patch-20
    rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-60
Summary: merge in (and adjust for conflicts) aaron.bentley@utoronto.ca--tla-2004/tlasrc--local--1.2--patch-20
Keywords: 

Patches applied:

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--local--1.2--patch-20
   Implemented --link option for tla changes to re-link trees

 * mt@wmipf.in-berlin.de--devel-2003/tla--wmipf--1.1--patch-26
   add function arch_tree_file_relpath

 * mt@wmipf.in-berlin.de--devel-2003/tla--wmipf--1.1--patch-27
   use arch_tree_file_relpath

